From: Stephen Berman <stephen.berman@gmx.net>
Date: Fri, 21 Jun 2013 21:40:50 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3603
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f6206a442e3e39f8e0a9d63fbb399a3af03fe765;p=emacs.git

Merge from trunk.
---

f6206a442e3e39f8e0a9d63fbb399a3af03fe765